Merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 3 Jul 2006 07:35:12 +0000 (08:35 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 3 Jul 2006 07:35:12 +0000 (08:35 +0100)
1  2 
tools/libxc/xc_linux_build.c
xen/include/public/arch-ia64.h

Simple merge
Simple merge